Minor adaptions and changes
New screen width