Updated with framework and css styles