Update layout, fix make_visible method