css changes and added viewport
Fixed css conflits