Refactor boolean input
Add refresh button and change their position