A lot of modifications in GUI project