Adding modal window
Fix select on calculator