Merging branch marina into master, final GUI design

GUI design on the server side slightly improved