Moved Button listeners from custom classes to action listener in question wndow frame. Indented everything