This merge request contains changes i made to components during my thesis. Following commits are relevant: e97db69b, e9a8820b, 5885ec81, 9fe87c4e, 67b07809