Added final layout and removed menu file