some change on layout and stylesheet