Tweaked positioning, still not liquid enough