Fix Formatting and remove redundant text boxes