UI: Fix Navigation as per comments and make it uniform