Added more functionality and navigation