Changed lib to full web app
Some minor changes