* Minor Fixes
* Layour improvements