rearranged screens and components
Merge branch 'master' of https://github.com/r3dDoX/fliBeacons