Clean up styles and fix action bar spinner