Revert 72e56a1..16f5c61

This rolls back to commit 72e56a188cb05b82365e5b1dfd357e9dc9cd63ba.
Navigation and UIButton modified/made.