refactoring
frontend facelift