Corrected top bar and messages