working properly now, still have to add css