updated some indentation and button naming