fixing so many things + add css