[FIX] minor changes on look and feel and some syntax errors