fixing some ui issues