Add border and improve user handling