Moar Views

Add markup to more views, a little cleanup work too