GUI + minor modifications