Stabler but with some ui bugs