Retuned the layout and apply better template