Update formatting to try and get consistent feel

Try and space out li elements and don't put sub elements in li if not needed
Update formatting for consistency