Updated code structure to improve ui responsiveness
Updated navigation margins to improve ui responsiveness