Refactoring, improved layout, working on ajax