Layout Improvement and Bug Fixes