Restyle

Restyle for ease of coding, just need to finish query to present the
website to client.