Inproving all assets layout