Group handeling done
Minor update to page overview