Updating spacing for readability & remove menubar