Added frontpage
Improved location generation