made major clean up on ui, however not a clean one yet