Some more aesthetic changes and 'fixes' to the spotlight