Changed theme and cleaned up layout