layout change to haml and some minor changes
Some minor changes 2