Fixed alignment problems.
Fixed wrong id issue.