Fixed some warnings and renamed some fields.

Fixed those 4 warnings related to layoutWidget and some fields were
renamed to more meaningful names.