more fixes and rearranges
fied typo in screenshot