Working again
Fixed some more layouts