Fixes for StartView