Layout almost final, added nav buttons