Crystal Glasses Layout improvement, optimization, bugfixes
Some cleanup & mini optimization