Fixed layout bug and add some signals