Realigned some of the components