fixed stacking and hover
Merge branch 'patrickbranch'