cleaner markup & better layout