add modal window + fix small bug