Moved to fluid design