Updated UI, Added navigation bar