Bugfix ver 0.1
Some styling improved