minor changes on theme2
cleanup & some small fixes and improvements