Got main screen working and some FAB improvements