Fixed some issues.
Updated CSS.
Merged 'feature/demo' branch.