Refractored GUI package