code well formatted.
just saving to clear status in netbeans.
minor fix on the width of the columns in manager mode.
minor fix on the trash icon in the columns.
minor fix on the trash icon in the columns.
minor fix on the trash icon in the columns.
Merge origin/master