Cleaned up routes, added additional styling and moved layouts around