fixed FC for empty user toogles and layout derp

Change-Id: I8350a9cbd0a3b24f958788640179cedafc162a55