merge sprint3
updated css changes