+@Machaba-Machaba - Fixing UI with new top bar