FIX - The Nav bar alignment && Top-bar polishments