good layout and inputs added