Correct APP_WIDTH
Work in progress - has bugs.