Fixed user layout. Moved a few text boxes around