Button location and sizes adjusted