fix bugs and improment look and feel