Changed the if-cases in the main XHTML to fragments!