Public pages improvments