Some changes regarding the layouts... still all veeeery basic.