fixed the height problems
Merge branch 'capright' into testing