Fixing bugs and starting with GUI