Bug Fixes with layout