Fixed some CSS issues and added custom media queries