Make pages looks nicer(old uncommited changes)