Fix formatting for normal mode