Resolved some important UI issues but shit still has to be done