Removed some layout "features". They should be implemented
on a higher level.