Bottom bar is still a bit janky but it's better.