added heirarchy and some style changes