added days
added comments on some where
layout