Completed buttons refactor
Added additional constraints for better buttons