Switching views possible

Also fixed some errors in UI