Initial GUI + small changes