Homepage Commit split 1

Homepage Commit split 2

Homepage Commit split 3

Homepage Commit split 4
Commit split 1

Bugfix #682
Commit split 2

fixing image type issue
some changes after rebasing
merge with remote