Reorderd methods and added a dummy for div