Little improvements in GUI