removed unnecessary button and formatted code
defined a field to help reducing http requests
removed unused class and updated existing class