Fixed binding issues and layou issues