Pull Request Dev_1.0

Fixed it po, also removed else from other pages with the same case