added different email entry box, fixed bus in layouts.