Fixing GUI. Not done yet.