button fixes and additional details