couple of bugfixes
limit sights and improve their performance
rewrite grid layout to increase performance