fix layout probs
fix js issuez