improve structure and statusline