improving layout/user friendliness a bit