Minor indentation and layout fixes