Layout fixes for key import