Fixed a layout issue
Fixed some forms & related links