Rework InfoActivity