Added display geometry + minimal changes