Changed some fields and layout