Minor improved diff in ui handling
Style fixes for header
Minor style fix