re-did some layout