Updated some GUI components
Merge branch 'master' of https://github.com/vdung7/ECatalog-Project