Minor layout fixes, and show level name as part of the Goal section