Little ammendments in UI