Update layout, remove unecessary else clause for make_visible method