Worked on views
Worked on layout a bit to help with continued development