Authorization and layout fix [Final]