Moved to general resources
Design changes