Layout changes, added proximity resolution method