Cleaned up code
 TODO: test no network found fuction
 TODO: other UI screens, transitions between screens