Cleaned up Site Design