Button colors added. Moved content into container.