added better layouts