- fixed double bind/flickering issue
- layout tweaks