Adds more layout, canvas stuff, and basic classes