minor changes
lots of changes in the UI, ready to be tested I think :)