Incorporated new button design and update mouse handling codes