refactoring, bugfixing, added popup to listitem, commenting(a little)