working on better layout