fixing more issues and changing design a bit