Cleaned up code, HTML conforms to demo