updated to fluid design