added fixes and new media queries