Got the ui looking and functioning much more smoothly