Redesign + navigation bar
merge with panos