Bordered Button changes - and repositioning to keep inside bounds works correctly now.