removed useless button
simplified UI
refactored code