added css, moved includes