Nazneen: Removed unnecessary layouts.
Nazneen: Improved the layout using android-style.