Add space before buttons and type fix