GUI extended with new views + controller fixes