Put in some more functionality and put in a bit of layout.