layout and stylesheet improvement