added front-end part
app.css coflict resolved