Simplifying some behaviors
Cosmethic changes in html