Added FAB and cleaned up design