Fixed small issue of button being in wrong place at wrong time