Added automatic height resizing
Added comments for recent changes