Fixed Errors, now changing layout