Added separate panels

Bug: Does not close server when window is closed