adding styles back
fixing broken merge