Clean up and add bootstrap and web start