Removed old private state code

Also, added shadow for demo buttons