Changes to handle top view