Fix tab layout and dashboard