Fix button position, task #427