Removed useless field, and cleaned layout by merging two fields