Fix ui and many few things