More Fixes

Working with more layout and forms.