made all fixes in structuring front fixes #1