More of Kristin's design. Cleaned up some js too