Changed config screen
Finished layout
Merged with upstream
Merged with upstream
Cleaned up Layout
Minor cleanup
Final minor cleanup
Merge pull request #45 from g-ortuno/beacon-v2

Layout for V2