More styles

Added more styles and cleaned up code