Remove not needed files and improving main layout