cleaned up and added media queries