Moved buttons to a single window

Still no functionality and the window resized.