Initial commit
button highlights, better organization
Reorganized code