Adding more views and google mapping functionality