Solving some UI issues