Minor edits for working gui