fixed location for buttons
stuf
merged conflict