Continued work on starter UI, small fixes and code improvements