lots of refactoring on server code, layout and design improved