Added Validation and cleaned up layout a little