Updating layout and menu