FIxing last set of bugs and css issues