Create Device button improvement