Code Tidy Up + Padding Changes

Code Tidy Up + Padding Changes to for clicking to include or exclude it