revamped the layout
merged master