Some cleaning up
Added FAB