refactoring and added in frontend layout
bit better