Added handle event keypup
Improved view