Feature/fix html