better layout and prelim local storage