implementing responsive ui
conflicts fix