Changed the orientation of several forms.
Fixed merge issues.