design added and things cleaned up