Fixed collision bugs and added Web view