Did some front-end stuff & added comments