added browse buttons and cleanup