Small changes for consistent button placing