Some Layout reworking