Cut out some bloat from template; Started personalizing