Map control and panel control works properly

Signed-off-by: Dojisung <dojisung0@gmail.com>