Made some style updates and changed some container names.