#90 Change topic view with imrpoved structure