Tweaks to layout trying to make it look less terrible. There is still much work to be done.