more gui-changes and some table awesomness