Fixed entry bugs regarding status and form layout