Cleaned up css, js and html, changed layout