Fixed wrong id, and finished the mockup