1st Refactoring Button code complete

~