Added error handlings & updated Mobile view