Updated widgets areas and functions