Modified the theme and bugs fixed