adding styles
fixing merge issues