Modified files for theme

Modified some file and improved the layout of theme.