Some quick UI updates
UI tweaked for more data, still fugly.