Added bootstrap and improved server side implementation