Fixed the fields display