Buttons redesigned, layout rearranged and legend added