Up-to-date, finished visually

This version should be good to take screenshots with-- no more graphical changes should be made from this point, just behavioral.