Fixed tip button & added comments