Rearrange layout to be consistent for LTE & 1x
Code cleanups; update README.md