Finalize porting to DSpace 4 and improve layout and configurations