Desktop Refactoring done. Time for web