Updated more designy version