streamlined theme, fixed buttons
Merge pull request #7 from abhinav42/master

Second theme, streamlined code , fixed issues