Style Fixes as per navigation Branch