Reduced overall width and realligned some buttons