Changed layout and visibility