Update 3

A lot of really good improvements. Fixed calculations, redid the layout code.