Add item alias
Fix navbar state problem
Added WSF_LAYOUT_CONTROL