fix layout and highlight servlet