Cleaned up project, worked on layouts page