Minor changes
Layouting the content
Improving layout