[Thinh] Change layout & css