Fixed indention issues and new topic