Added button template; Updated Readme; some cleanup and renaming