Updated styles
fixed merge errors