stripped out unnecessary logic
adjusted spacing
moved actions that have no logic to bottom of page