updated to new fluid design