fixes #332, #334 and other visual glitches
Merge pull request #336 from krepa098/master

fixes #332, #334 and other visual glitches