Added FAB, tweaked layouts