Fixes container bugs and prepares for playlist button feature