position things better, fix empty logic