minhnguyen - add header for page, fix bug