Overall Code Cleanup

Need to cleanup main.scss file next.