GUI report button hit area ajustment & refactoring