Front Page Update and few fixes