big changes

lots of changes to ui and some db changes etc