Removing the theme code from previous commit. Needs to be done properly with android themes/styles
Removing unused layout