reorg and messing around with statusline