Consolidated Services
updated build script
improved ui