Small design improvements, 'slim' mode until 'fat client' mode works better, fix some small bugs