Fixed layout and added Menu