2nd tier and inner elements spacing fix

2nd tier and inner elements spacing fix for non-admin view.