Fixed background alignment, added controllers