Fix Z issues with button