More conditions for buttons added
Merge pull request #226 from emavro/feature-appstore-server

More conditions for buttons added