buttons redesign
optimize code