Edited fields and inserted some callback and theme