Fix Page & UI