Layout fix & new plugins